linux: Quieten blkfront output.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index 6c5bd8ed9095477050a89b9e45b884a6c4bd15b5..4111e6f78610aae547cb10d4b0990be09d28d98d 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@ -56,20 +56,6 @@
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 
-#if 1
-#define IPRINTK(fmt, args...)                          \
-       printk(KERN_INFO "xen_blk: " fmt, ##args)
-#else
-#define IPRINTK(fmt, args...) ((void)0)
-#endif
-
-#if 1
-#define WPRINTK(fmt, args...)                          \
-       printk(KERN_WARNING "xen_blk: " fmt, ##args)
-#else
-#define WPRINTK(fmt, args...) ((void)0)
-#endif
-
 #define DPRINTK(_f, _a...) pr_debug(_f, ## _a)
 
 #if 0

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
index aa9333ef418aa564ac9a7ddbc92023be7a36dab3..145e795d29ceb06a3f30f7ed00bf5789c42a2061 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
@@ -128,14 +128,12 @@ xlbd_alloc_major_info(int major, int minor, int index)
                break;
        }
 
-       printk("Registering block device major %i\n", ptr->major);
        if (register_blkdev(ptr->major, ptr->type->devname)) {
-               WPRINTK("can't get major %d with name %s\n",
-                       ptr->major, ptr->type->devname);
                kfree(ptr);
                return NULL;
        }
 
+       printk("xen-vbd: registered block device major %i\n", ptr->major);
        major_info[index] = ptr;
        return ptr;
 }